Skip to content

OSDOCS-14901: Added network-type-migration- annotation step to nw-ov… #95003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 20, 2025
Merged

OSDOCS-14901: Added network-type-migration- annotation step to nw-ov… #95003

merged 1 commit into from
Jun 20, 2025

Conversation

dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Jun 19, 2025 •
edited
Loading

Version(s):
4.12 to 4.16

Issue:
OSDOCS-14901

Link to docs preview:

  • SME has approved this change (Sanjay Tripathi).
  • QE has approved this change (Zhanqi Zhao).

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 19, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 19, 2025 •
edited by openshift-ci bot
Loading

@dfitzmau: This pull request references OSDOCS-14901 which is a valid jira issue.

In response to this:

Version(s):
4.12 to 4.16

Issue:
OSDOCS-14901

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 19, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jun 19, 2025 •
edited
Loading

🤖 Fri Jun 20 08:39:22 - Prow CI generated the docs preview:

https://95003--ocpdocs-pr.netlify.app/
https://95003--ocpdocs-pr.netlify.app/openshift-enterprise/latest/networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.html

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 19, 2025 •
edited by openshift-ci bot
Loading

@dfitzmau: This pull request references OSDOCS-14901 which is a valid jira issue.

In response to this:

Version(s):
4.12 to 4.16

Issue:
OSDOCS-14901

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 19, 2025 •
edited by openshift-ci bot
Loading

@dfitzmau: This pull request references OSDOCS-14901 which is a valid jira issue.

In response to this:

Version(s):
4.12 to 4.16

Issue:
OSDOCS-14901

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

sanjaytripathi97
sanjaytripathi97 reviewed Jun 19, 2025
View reviewed changes
Copy link

@sanjaytripathi97 sanjaytripathi97 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 19, 2025 •
edited by openshift-ci bot
Loading

@dfitzmau: This pull request references OSDOCS-14901 which is a valid jira issue.

In response to this:

Version(s):
4.12 to 4.16

Issue:
OSDOCS-14901

Link to docs preview:

  • SME has approved this change.
  • QE has approved this change.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@dfitzmau dfitzmau added the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 19, 2025
@mburke5678 mburke5678 added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Jun 19, 2025
@mburke5678
Copy link
Contributor

/lgtm

@mburke5678 mburke5678 added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels Jun 19, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 19, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 19, 2025 •
edited by openshift-ci bot
Loading

@dfitzmau: This pull request references OSDOCS-14901 which is a valid jira issue.

In response to this:

Version(s):
4.12 to 4.16

Issue:
OSDOCS-14901

Link to docs preview:

  • SME has approved this change (Sanjay Tripathi).
  • QE has approved this change (Zhanqi Zhao).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@zhaozhanqi
Copy link

LGTM

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 20, 2025 •
edited by openshift-ci bot
Loading

@dfitzmau: This pull request references OSDOCS-14901 which is a valid jira issue.

In response to this:

Version(s):
4.12 to 4.16

Issue:
OSDOCS-14901

Link to docs preview:

  • SME has approved this change (Sanjay Tripathi).
  • QE has approved this change (Zhanqi Zhao).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 20, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jun 20, 2025

New changes are detected. LGTM label has been removed.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jun 20, 2025

@dfitzmau: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@dfitzmau dfitzmau merged commit 8a4b50f into openshift:enterprise-4.16 Jun 20, 2025
2 checks passed
@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.15
/cherrypick enterprise-4.14
/cherrypick enterprise-4.13
/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@dfitzmau: #95003 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc
Using index info to reconstruct a base tree...
A	modules/initiating-limited-live-migration.adoc
M	modules/nw-ovn-kubernetes-migration.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-ovn-kubernetes-migration.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-kubernetes-migration.adoc
CONFLICT (modify/delete): modules/initiating-limited-live-migration.adoc deleted in HEAD and modified in OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc. Version OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc of modules/initiating-limited-live-migration.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc

In response to this:

/cherrypick enterprise-4.15
/cherrypick enterprise-4.14
/cherrypick enterprise-4.13
/cherrypick enterprise-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.15

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.14

@dfitzmau
Copy link
Contributor Author

/cherrypick enterprise-4.13

@openshift-cherrypick-robot
Copy link

@dfitzmau: #95003 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc
Using index info to reconstruct a base tree...
M	modules/nw-ovn-kubernetes-migration.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-ovn-kubernetes-migration.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-kubernetes-migration.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@dfitzmau: #95003 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc
Using index info to reconstruct a base tree...
A	modules/initiating-limited-live-migration.adoc
M	modules/nw-ovn-kubernetes-migration.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-ovn-kubernetes-migration.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-kubernetes-migration.adoc
CONFLICT (modify/delete): modules/initiating-limited-live-migration.adoc deleted in HEAD and modified in OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc. Version OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc of modules/initiating-limited-live-migration.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc

In response to this:

/cherrypick enterprise-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@dfitzmau: #95003 failed to apply on top of branch "enterprise-4.13":

Applying: OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc
Using index info to reconstruct a base tree...
A	modules/initiating-limited-live-migration.adoc
M	modules/nw-ovn-kubernetes-migration.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nw-ovn-kubernetes-migration.adoc
CONFLICT (content): Merge conflict in modules/nw-ovn-kubernetes-migration.adoc
CONFLICT (modify/delete): modules/initiating-limited-live-migration.adoc deleted in HEAD and modified in OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc. Version OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc of modules/initiating-limited-live-migration.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-14901: Added network-type-migration- annotation step to nw-ovn-kubernetes-migration.adoc doc

In response to this:

/cherrypick enterprise-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

This was referenced Jun 20, 2025
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sanjaytripathi97 sanjaytripathi97 sanjaytripathi97 left review comments

Assignees

@mburke5678 mburke5678

Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@dfitzmau @openshift-ci-robot @ocpdocs-previewbot @mburke5678 @zhaozhanqi @openshift-cherrypick-robot @sanjaytripathi97